Merge git://git.denx.de/u-boot-mpc85xx

author Tom Rini <[email protected]>

Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)

committer Tom Rini <[email protected]>

Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)
author Tom Rini <[email protected]>
Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)
committer Tom Rini <[email protected]>
Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)
diff --cc drivers/mmc/fsl_esdhc.c
Simple merge
diff --cc drivers/mmc/mmc.c
Simple merge
author	Tom Rini <[email protected]>
	Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)
committer	Tom Rini <[email protected]>
	Tue, 5 May 2015 18:57:23 +0000 (14:57 -0400)
		1	2
drivers/mmc/fsl_esdhc.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mmc/mmc.c	patch \|	diff1 \|	diff2 \|	blob \| history